Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix esp32 IDF version number handling for patch releases #2707

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Fix esp32 IDF version number handling for patch releases #2707

merged 2 commits into from
Jan 11, 2024

Conversation

mikee47
Copy link
Contributor

@mikee47 mikee47 commented Jan 11, 2024 •
edited
Loading

Patch releases such as v5.0.5 break toolchain identification since we require just 'v5.0'.
This PR fixes that issue.

Note that all sming esp32 IDF versions have been brought up to date by merging latest release branch for each version.
Tags have have been applied as follows; the latest merged upstream commit is shown.

Sming branch Tag Espressif Tag Date
sming/release/v4.3 v4.3.7-sming v4.3.7-1-g3a71941503 2/1/2024
sming/release/v4.4 v4.4.6-sming v4.4.6-374-gbb8dd9d35b 3/1/2024
sming/release/v5.0 v5.0.5-sming v5.0.5-166-g209a0361c0 5/1/2024
sming/release/v5.2 v5.2-beta1-sming v5.2-beta1-263-ge49823f10c 18/12/2023

@what-the-diff What The Diff
Copy link

what-the-diff bot commented Jan 11, 2024

PR Summary

  • Simplified Version Information
    The code has been altered to provide cleaner, more straightforward version information. The IDF_VERSION variable, which used to contain hyphen-separated numbers and additional details, is now simplified. It strictly represents major and minor version numbers, making it easier to identify the software's version at a glance. This change could simplify version tracking and compatibility checks in the future.

@mikee47 mikee47 force-pushed the fix/esp32-idf-version branch from e6088aa to 8e1c3b6 Compare January 11, 2024 09:55
Fix esp32 IDF version number handling for minor releases
1f3dc8d 
For example where branch is tagged 'v5.0.5-173-g9d6770dfbb' we require just 'v5.0' to identify toolsets, python, etc.
@mikee47 mikee47 force-pushed the fix/esp32-idf-version branch from 8e1c3b6 to 1f3dc8d Compare January 11, 2024 09:57
@slaff slaff added this to the 5.2.0 milestone Jan 11, 2024
@mikee47 mikee47 changed the title Fix esp32 IDF version number handling for minor releases Fix esp32 IDF version number handling for patch releases Jan 11, 2024
@mikee47
Copy link
Contributor Author

mikee47 commented Jan 11, 2024

@slaff I'm having second thoughts about doing this. The version numbers from git describe don't reflect merges, etc. I'm planning to use tags like v4.3.7-sming so this PR won't be needed.

@mikee47 mikee47 changed the title Fix esp32 IDF version number handling for patch releases [WIP] Fix esp32 IDF version number handling for patch releases Jan 11, 2024
@mikee47 mikee47 changed the title [WIP] Fix esp32 IDF version number handling for patch releases Fix esp32 IDF version number handling for patch releases Jan 11, 2024
@mikee47
Copy link
Contributor Author

mikee47 commented Jan 11, 2024

@slaff OK, we'll keep this PR but have restarted the esp32 CI checks to ensure the newly tagged IDF branches are handled correctly.

@slaff
Copy link
Contributor

slaff commented Jan 11, 2024

@mikee47 is this PR ready?

@mikee47
Copy link
Contributor Author

mikee47 commented Jan 11, 2024

@slaff Yes, all done.

@slaff slaff merged commit 45d0f95 into SmingHub:develop Jan 11, 2024
46 checks passed
@mikee47 mikee47 deleted the fix/esp32-idf-version branch January 11, 2024 12:51
@slaff slaff mentioned this pull request Feb 5, 2024
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
5.2.0
Development

Successfully merging this pull request may close these issues.
2 participants
@mikee47 @slaff